]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st-theme-node: Disable transitions if animations-enabled is off
authorJasper St. Pierre <jstpierre@mecheye.net>
Fri, 19 Apr 2013 18:06:02 +0000 (14:06 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Fri, 19 Apr 2013 18:34:06 +0000 (14:34 -0400)
https://bugzilla.gnome.org/show_bug.cgi?id=698391

src/st/st-widget.c

index 42992ece79fa3a3b39b0a4e0c136c1cec8000157..7133e856137439f29ac7b6b2b3c546bee35f9c29 100644 (file)
@@ -1533,6 +1533,7 @@ st_widget_recompute_style (StWidget    *widget,
   StThemeNode *new_theme_node = st_widget_get_theme_node (widget);
   int transition_duration;
   gboolean paint_equal;
+  gboolean animations_enabled;
 
   if (new_theme_node == old_theme_node)
     {
@@ -1551,7 +1552,11 @@ st_widget_recompute_style (StWidget    *widget,
   if (paint_equal)
     st_theme_node_copy_cached_paint_state (new_theme_node, old_theme_node);
 
-  if (transition_duration > 0)
+  g_object_get (gtk_settings_get_default (),
+                "gtk-enable-animations", &animations_enabled,
+                NULL);
+
+  if (animations_enabled && transition_duration > 0)
     {
       if (widget->priv->transition_animation != NULL)
         {